Manual merge of version 4:25.8.4-1+rpi1 and 4:26.2.0-1 to produce 4:26.2.0-1+rpi1

Merge version 4:25.2.3-2+rpi1+deb13u2 and 4:25.8.4-1 to produce 4:25.8.4-1+rpi1

Merge libreoffice (4:26.2.0-1) import into refs/heads/workingbranch

[PATCH 01/21] Rust Bindings: Add initial documentation for Rust UNO bindings

Change-Id: Ibb2978ebf1bbca8afddd13bdf8fba5e070c9037f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198115
Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com>
Tested-by: Jenkins
Gbp-Pq: Name Rust-Bindings-Add-initial-documentation-for-Rust-UNO.diff

[PATCH] remove JITC_PROCESSOR_TYPE export for powerpc

long obsolete; there's no IBM JDK for 32-bit ppc anymore. And it breaks
creating instdir/program/soffice with +x by cp (sed doesn't keep the
permission, obviously)

Change-Id: I9e8ffc6017056adb5142099a661761c2caaa87c4

Gbp-Pq: Name remove-JITC_PROCESSOR_TYPE-setting.diff

lpsolve-fPIC

Gbp-Pq: Name lpsolve-fPIC.diff

skia-gcc-no-musttail

Gbp-Pq: Name skia-gcc-no-musttail.diff

cargo-build-flag

Gbp-Pq: Name cargo-build-flag.diff

rust-uno-DEB_CARGO_CRATE

Gbp-Pq: Name rust-uno-DEB_CARGO_CRATE.diff

fix-rust_uno-path-for-cargo-wrapper

===================================================================

Gbp-Pq: Name fix-rust_uno-path-for-cargo-wrapper.diff

we-rely-on-dicts-as-non-extensions-in-checks

checking for the extension (only) dos not make sense; this is also fulklfilled by "system" hunspell dicts
(here: hunspell-en-us), which we have in Build-Depends:

Gbp-Pq: Name we-rely-on-dicts-as-non-extensions-in-checks.diff

system-crates

Gbp-Pq: Name system-crates.diff

disable-uitest-xmlsecurity-gpg

Gbp-Pq: Name disable-uitest-xmlsecurity-gpg.diff

[PATCH] sunjre: check all four possible OpenJDK variants for libjvm.so

Since OpenJDK 21, the "minimal" and "zero" variants of JVM no longer
reside in the "server" directory in $JAVA_HOME/lib, making the loader
unable to find libjvm.so. This regresses LO builds on platforms with
only those variants of JVM (i.e. without a HotSpot port).

Example error message is like this:

> exception occurred: Could not create Java implementation loader at
> ./stoc/source/javaloader/javaloader.cxx:551

Fix it by probing all four possible variant directories for libjvm.so.
This is tested on Debian unstable (loong64 port) to fix the packaging.

Link: https://bugs.openjdk.org/browse/JDK-8273494
Link: https://github.com/openjdk/jdk/pull/5440
Link: https://github.com/openjdk/jdk/commit/8fbcc8239a3fc04e56ebbd287c7bb5db731977b7
Change-Id: I3545f93054d7a3af0181e4c739c82efaaf8aeaed

Gbp-Pq: Name jdk-minimal-and-zero-paths.diff

pdfium-ports

Gbp-Pq: Name pdfium-ports.diff

adapt-for-new-carlito

Gbp-Pq: Name adapt-for-new-carlito.diff

we-dont-have-the-needed-fonts

Gbp-Pq: Name we-dont-have-the-needed-fonts.diff

do-not-abort-on-NON_APPLICATION_FONT_USE

Gbp-Pq: Name do-not-abort-on-NON_APPLICATION_FONT_USE.diff

moreIconsDialog-accesses-internet

Gbp-Pq: Name moreIconsDialog-accesses-internet.diff

Explicitly set fpu mode on armhf

Gbp-Pq: Name arm-fp-mode.diff

[PATCH] Resolves: rhbz#1432468 disable opencl by default

Change-Id: Ie037fcabdd219f195425979dd721501fb5527573

Gbp-Pq: Name no-opencl-per-default.diff

disable-shortcuts_tab_navigation-uitest

Gbp-Pq: Name disable-shortcuts_tab_navigation-uitest.diff

add-access2base-doc

Gbp-Pq: Name add-access2base-doc.diff

Add safer float comparisons to bridgetest equals()

Bug-Ubuntu: https://launchpad.net/bugs/1832360

Gbp-Pq: Name fix-flaky-bridgetest.diff

[PATCH] mariadb

Gbp-Pq: Name use-mariadb-java-instead-of-mysql-java.diff

disableClassPathURLCheck

Gbp-Pq: Name disableClassPathURLCheck.diff

do-not-hide-test-output

Gbp-Pq: Name do-not-hide-test-output.diff

disable-java-in-odk-build-examples-on-zero-vm

Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff

appstream-ignore-startcenter

Gbp-Pq: Name appstream-ignore-startcenter.diff

Hide startcenter and math from the shell

Bug-Ubuntu: https://launchpad.net/bugs/1696250
Forwarded: not-needed

Gbp-Pq: Name hide-math-desktop-file.patch

cppunit-optional

Gbp-Pq: Name cppunit-optional.diff

system-officeotron-and-odfvalidator

Gbp-Pq: Name system-officeotron-and-odfvalidator.diff

no-packagekit-per-default

Gbp-Pq: Name no-packagekit-per-default.diff

javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff

fix-internal-hsqldb-build

Gbp-Pq: Name fix-internal-hsqldb-build.diff

disable-flaky-tests

14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some
               system dependent way) e.g. on the Win@6 tinderbox it always
               crashes
14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of
               the time

Gbp-Pq: Name disable-flaky-tests.diff

debian-hardened-buildflags-no-LO-fstack-protector-strong

don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the
hardening flags from dpkg-buildflags anyway.

Gbp-Pq: Name debian-hardened-buildflags-no-LO-fstack-protector-strong.diff

debian-hardened-buildflags-CPPFLAGS

Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff

mediwiki-oor-replace

Gbp-Pq: Name mediwiki-oor-replace.diff

make-package-modules-not-suck

Gbp-Pq: Name make-package-modules-not-suck.diff

jdbc-driver-classpaths

Gbp-Pq: Name jdbc-driver-classpaths.diff

reportdesign-mention-package

Gbp-Pq: Name reportdesign-mention-package.diff

sensible-lomua

===================================================================

Gbp-Pq: Name sensible-lomua.diff

help-msg-add-package-info

Gbp-Pq: Name help-msg-add-package-info.diff

mention-java-common-package

Gbp-Pq: Name mention-java-common-package.diff

install-fixes

Gbp-Pq: Name install-fixes.diff

build-against-shared-lpsolve

Gbp-Pq: Name build-against-shared-lpsolve.diff

debian-debug

Gbp-Pq: Name debian-debug.diff

splits-adapt-registry

Gbp-Pq: Name splits-adapt-registry.diff

jurt-soffice-location

commit b71107fb12e3c3125e0cb62c5a4f6636a80c6408
Author:     Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
AuthorDate: Tue Jun 7 11:52:37 2011 +0200
Commit:     Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
CommitDate: Tue Jun 7 11:52:37 2011 +0200

    on debian-based systems, we know where our soffice binary is

Gbp-Pq: Name jurt-soffice-location.diff

debian-opt

Gbp-Pq: Name debian-opt.diff

libreoffice (4:26.2.0-1) unstable; urgency=medium

  * LibeOffice 26.2.0 final release (identical to rc3)

  * upload to unstable

  * debian/watch: back to releases/download.documenfoundation.org

[dgit import unpatched libreoffice 4:26.2.0-1]

Import libreoffice_26.2.0.orig.tar.xz

[dgit import orig libreoffice_26.2.0.orig.tar.xz]

Import libreoffice_26.2.0.orig-helpcontent2.tar.xz

[dgit import orig libreoffice_26.2.0.orig-helpcontent2.tar.xz]

Import libreoffice_26.2.0.orig-translations.tar.xz

[dgit import orig libreoffice_26.2.0.orig-translations.tar.xz]

Import libreoffice_26.2.0-1.debian.tar.xz

[dgit import tarball libreoffice 4:26.2.0-1 libreoffice_26.2.0-1.debian.tar.xz]

Merge libreoffice (4:25.8.4-1) import into refs/heads/workingbranch

[PATCH] remove JITC_PROCESSOR_TYPE export for powerpc

long obsolete; there's no IBM JDK for 32-bit ppc anymore. And it breaks
creating instdir/program/soffice with +x by cp (sed doesn't keep the
permission, obviously)

Change-Id: I9e8ffc6017056adb5142099a661761c2caaa87c4

Gbp-Pq: Name remove-JITC_PROCESSOR_TYPE-setting.diff

lpsolve-fPIC

Gbp-Pq: Name lpsolve-fPIC.diff

apparmor-thunderbird

Gbp-Pq: Name apparmor-thunderbird.diff

apparmor-allow-local-override

Gbp-Pq: Name apparmor-allow-local-override.diff

disable-uitest-xmlsecurity-gpg

Gbp-Pq: Name disable-uitest-xmlsecurity-gpg.diff

[PATCH] sunjre: check all four possible OpenJDK variants for libjvm.so

Since OpenJDK 21, the "minimal" and "zero" variants of JVM no longer
reside in the "server" directory in $JAVA_HOME/lib, making the loader
unable to find libjvm.so. This regresses LO builds on platforms with
only those variants of JVM (i.e. without a HotSpot port).

Example error message is like this:

> exception occurred: Could not create Java implementation loader at
> ./stoc/source/javaloader/javaloader.cxx:551

Fix it by probing all four possible variant directories for libjvm.so.
This is tested on Debian unstable (loong64 port) to fix the packaging.

Link: https://bugs.openjdk.org/browse/JDK-8273494
Link: https://github.com/openjdk/jdk/pull/5440
Link: https://github.com/openjdk/jdk/commit/8fbcc8239a3fc04e56ebbd287c7bb5db731977b7
Change-Id: I3545f93054d7a3af0181e4c739c82efaaf8aeaed

Gbp-Pq: Name jdk-minimal-and-zero-paths.diff

pdfium-ports

Gbp-Pq: Name pdfium-ports.diff

adapt-for-new-carlito

Gbp-Pq: Name adapt-for-new-carlito.diff

we-dont-have-the-needed-fonts

Gbp-Pq: Name we-dont-have-the-needed-fonts.diff

do-not-abort-on-NON_APPLICATION_FONT_USE

Gbp-Pq: Name do-not-abort-on-NON_APPLICATION_FONT_USE.diff

moreIconsDialog-accesses-internet

Gbp-Pq: Name moreIconsDialog-accesses-internet.diff

Explicitly set fpu mode on armhf

Gbp-Pq: Name arm-fp-mode.diff

Support tofu+pgp trust model in GnuPG

Bug-Debian: https://bugs.debian.org/955271
Forwarded: no

GnuPG supports a trust-on-first-use layer that sits on top of the
standard PGP trust model. If this is enabled, 'gpg --list-keys' needs
write and lock permissions on the TOFU database to return any useful
data. Allow this access through AppArmor.

Gbp-Pq: Name apparmor-gnupg-tofu.diff

apparmor-updates

Gbp-Pq: Name apparmor-updates.diff

[PATCH] Resolves: rhbz#1432468 disable opencl by default

Change-Id: Ie037fcabdd219f195425979dd721501fb5527573

Gbp-Pq: Name no-opencl-per-default.diff

disable-shortcuts_tab_navigation-uitest

Gbp-Pq: Name disable-shortcuts_tab_navigation-uitest.diff

add-access2base-doc

Gbp-Pq: Name add-access2base-doc.diff

Add safer float comparisons to bridgetest equals()

Bug-Ubuntu: https://launchpad.net/bugs/1832360

Gbp-Pq: Name fix-flaky-bridgetest.diff

apparmor-opencl

apparmor: Add opencl support

AppArmor in Debian Buster now has OpenCL abstractions.

Include OpenCL abstractions to fix OpenCL usage in Calc.

Gbp-Pq: Name apparmor-opencl.diff

[PATCH] mariadb

Gbp-Pq: Name use-mariadb-java-instead-of-mysql-java.diff

disableClassPathURLCheck

Gbp-Pq: Name disableClassPathURLCheck.diff

apparmor-mesa

Gbp-Pq: Name apparmor-mesa.diff

[PATCH] apparmor: use dri-enumerate abstraction

Remove backported rule and use new dri-enumerate abstraction instead.
dri-enumerate is available in AppArmor 2.13, which recently migrated
into Debian Buster.

Change-Id: I64919edc1882f7bc1e65cfb94686464c5350f699

Gbp-Pq: Name apparmor-cleanups.diff

apparmor-allow-java.security

Gbp-Pq: Name apparmor-allow-java.security.diff

do-not-hide-test-output

Gbp-Pq: Name do-not-hide-test-output.diff

disable-java-in-odk-build-examples-on-zero-vm

Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff

appstream-ignore-startcenter

Gbp-Pq: Name appstream-ignore-startcenter.diff

Hide startcenter and math from the shell

Bug-Ubuntu: https://launchpad.net/bugs/1696250
Forwarded: not-needed

Gbp-Pq: Name hide-math-desktop-file.patch

apparmor-complain

Gbp-Pq: Name apparmor-complain.diff

cppunit-optional

Gbp-Pq: Name cppunit-optional.diff

system-officeotron-and-odfvalidator

Gbp-Pq: Name system-officeotron-and-odfvalidator.diff

no-packagekit-per-default

Gbp-Pq: Name no-packagekit-per-default.diff

javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff

fix-internal-hsqldb-build

Gbp-Pq: Name fix-internal-hsqldb-build.diff

disable-flaky-tests

14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some
               system dependent way) e.g. on the Win@6 tinderbox it always
               crashes
14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of
               the time

Gbp-Pq: Name disable-flaky-tests.diff

debian-hardened-buildflags-no-LO-fstack-protector-strong

don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the
hardening flags from dpkg-buildflags anyway.

Gbp-Pq: Name debian-hardened-buildflags-no-LO-fstack-protector-strong.diff

debian-hardened-buildflags-CPPFLAGS

Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff

mediwiki-oor-replace

Gbp-Pq: Name mediwiki-oor-replace.diff

make-package-modules-not-suck

Gbp-Pq: Name make-package-modules-not-suck.diff

jdbc-driver-classpaths

Gbp-Pq: Name jdbc-driver-classpaths.diff

reportdesign-mention-package

Gbp-Pq: Name reportdesign-mention-package.diff

sensible-lomua

===================================================================

Gbp-Pq: Name sensible-lomua.diff

help-msg-add-package-info

Gbp-Pq: Name help-msg-add-package-info.diff